Merge update-org-to-6.35
authorCarsten Dominik <carsten.dominik@gmail.com>
Thu, 15 Apr 2010 10:13:27 +0000 (12:13 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Thu, 15 Apr 2010 10:13:27 +0000 (12:13 +0200)

Trivial merge